memprotect: Move files to specific platform makefiles

All the arm platforms were including the files related to
mem-protect. This configuration generates some problems
with new platforms that don't support such functionality,
and for that reason this patch moves these files to the
platform specific makefiles.

Change-Id: I6923e5224668b76667795d8e11723cede7979b1e
Signed-off-by: Roberto Vargas <[email protected]>

diff --git a/plat/arm/board/common/board_common.mk b/plat/arm/board/common/board_common.mk
index d63ae9a3b6f579d096fb2898ee5ee7f80abaa5a8..af47c0defcef1015e50a094839c245bf2caf31da 100644 (file)
--- a/plat/arm/board/common/board_common.mk
+++ b/plat/arm/board/common/board_common.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -12,13 +12,7 @@ PLAT_BL_COMMON_SOURCES       +=      drivers/arm/pl011/${ARCH}/pl011_console.S               \
 
 BL1_SOURCES            +=      plat/arm/board/common/drivers/norflash/norflash.c
 
-BL2_SOURCES            +=      lib/utils/mem_region.c                                  \
-                               plat/arm/common/arm_nor_psci_mem_protect.c              \
-                               plat/arm/board/common/drivers/norflash/norflash.c
-
-BL31_SOURCES           +=      lib/utils/mem_region.c                                  \
-                               plat/arm/board/common/drivers/norflash/norflash.c       \
-                               plat/arm/common/arm_nor_psci_mem_protect.c
+BL2_SOURCES            +=      plat/arm/board/common/drivers/norflash/norflash.c
 
 ifneq (${TRUSTED_BOARD_BOOT},0)
   ifneq (${ARM_CRYPTOCELL_INTEG}, 1)

diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 2b1e0ac70f2631be3c566bd109b0ae6d81371659..fd93b99775031d105ceb25a2fb9377878b179554 100644 (file)
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -134,13 +134,17 @@ BL1_SOURCES               +=      drivers/io/io_semihosting.c                     \
 
 
 BL2_SOURCES            +=      drivers/io/io_semihosting.c                     \
+                               lib/utils/mem_region.c                          \
                                lib/semihosting/semihosting.c                   \
                                lib/semihosting/${ARCH}/semihosting_call.S      \
                                plat/arm/board/fvp/fvp_bl2_setup.c              \
                                plat/arm/board/fvp/fvp_io_storage.c             \
                                plat/arm/board/fvp/fvp_trusted_boot.c           \
+                               plat/arm/common/arm_nor_psci_mem_protect.c      \
                                ${FVP_SECURITY_SOURCES}
 
+
+
 ifeq (${BL2_AT_EL3},1)
 BL2_SOURCES            +=      plat/arm/board/fvp/${ARCH}/fvp_helpers.S        \
                                plat/arm/board/fvp/fvp_bl2_el3_setup.c          \
@@ -156,11 +160,14 @@ BL2U_SOURCES              +=      plat/arm/board/fvp/fvp_bl2u_setup.c             \
                                ${FVP_SECURITY_SOURCES}
 
 BL31_SOURCES           +=      drivers/arm/smmu/smmu_v3.c                      \
+                               lib/utils/mem_region.c                          \
                                plat/arm/board/fvp/fvp_bl31_setup.c             \
                                plat/arm/board/fvp/fvp_pm.c                     \
                                plat/arm/board/fvp/fvp_topology.c               \
                                plat/arm/board/fvp/aarch64/fvp_helpers.S        \
                                plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c      \
+                               plat/arm/board/common/drivers/norflash/norflash.c \
+                               plat/arm/common/arm_nor_psci_mem_protect.c      \
                                ${FVP_CPU_LIBS}                                 \
                                ${FVP_GIC_SOURCES}                              \
                                ${FVP_INTERCONNECT_SOURCES}                     \

diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/board/juno/platform.mk
index 3ab99ef3a39cc57a95257c1961a9aba7d18cb73f..16390fa4e7e3e5d213f622f411441f1ce7d38e11 100644 (file)
--- a/plat/arm/board/juno/platform.mk
+++ b/plat/arm/board/juno/platform.mk
@@ -59,7 +59,9 @@ BL1_SOURCES           +=      lib/cpus/aarch64/cortex_a53.S           \
                                ${JUNO_INTERCONNECT_SOURCES}            \
                                ${JUNO_SECURITY_SOURCES}
 
-BL2_SOURCES            +=      plat/arm/board/juno/juno_bl2_setup.c    \
+BL2_SOURCES            +=      lib/utils/mem_region.c                  \
+                               plat/arm/board/juno/juno_bl2_setup.c    \
+                               plat/arm/common/arm_nor_psci_mem_protect.c \
                                ${JUNO_SECURITY_SOURCES}
 
 BL2U_SOURCES           +=      ${JUNO_SECURITY_SOURCES}
@@ -67,7 +69,10 @@ BL2U_SOURCES         +=      ${JUNO_SECURITY_SOURCES}
 BL31_SOURCES           +=      lib/cpus/aarch64/cortex_a53.S           \
                                lib/cpus/aarch64/cortex_a57.S           \
                                lib/cpus/aarch64/cortex_a72.S           \
+                               lib/utils/mem_region.c                  \
                                plat/arm/board/juno/juno_topology.c     \
+                               plat/arm/board/common/drivers/norflash/norflash.c \
+                               plat/arm/common/arm_nor_psci_mem_protect.c \
                                ${JUNO_GIC_SOURCES}                     \
                                ${JUNO_INTERCONNECT_SOURCES}            \
                                ${JUNO_SECURITY_SOURCES}

diff --git a/plat/arm/board/sgi575/platform.mk b/plat/arm/board/sgi575/platform.mk
index 9893ba500a7a70a83ea471ff02bd9ff288d1f649..284bae8aad43a5688973f34791421323b7ab938c 100644 (file)
--- a/plat/arm/board/sgi575/platform.mk
+++ b/plat/arm/board/sgi575/platform.mk
@@ -5,3 +5,10 @@
 #
 
 include plat/arm/css/sgi/sgi-common.mk
+
+BL2_SOURCES            +=      lib/utils/mem_region.c                  \
+                               plat/arm/common/arm_nor_psci_mem_protect.c
+
+BL31_SOURCES           +=      lib/utils/mem_region.c                  \
+                               plat/arm/board/common/drivers/norflash/norflash.c \
+                               plat/arm/common/arm_nor_psci_mem_protect.c

diff --git a/plat/arm/board/sgm775/platform.mk b/plat/arm/board/sgm775/platform.mk
index 71e71e1c996a4f9d6a247cd91837164790bcb0bd..633cee66471586e83eeca96db70e45f84d150854 100644 (file)
--- a/plat/arm/board/sgm775/platform.mk
+++ b/plat/arm/board/sgm775/platform.mk
@@ -11,3 +11,10 @@ SGM775_BASE= plat/arm/board/sgm775
 FDT_SOURCES += ${SGM775_BASE}/fdts/sgm775_tb_fw_config.dts
 
 PLAT_INCLUDES +=-I${SGM775_BASE}/include/
+
+BL2_SOURCES            +=      lib/utils/mem_region.c                  \
+                               plat/arm/common/arm_nor_psci_mem_protect.c
+
+BL31_SOURCES           +=      lib/utils/mem_region.c                  \
+                               plat/arm/board/common/drivers/norflash/norflash.c \
+                               plat/arm/common/arm_nor_psci_mem_protect.c